Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 01:23:15 +0000 (17:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 01:23:15 +0000 (17:23 -0800)
commit88b2b217f968d464ef619bb535d5ef57893fe205
tree53aa696a66e2a3361ea498c2741b7119e70bf1a0
parent2e3884b02c147fea1b08472f65cf8353422d4640
parent015a0b6157334c1b95cdf163759ff9c67f24053d
Merge from mainline.